Create Fringe-Benefits.md #30245

sonialiap · 2023-10-24T11:33:05Z

Details

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/319744
PROPOSAL:

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
I verified that if a function's arguments changed that all usages have also been updated correctly
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG))
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2023-10-24T11:33:10Z

@akinwale Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

OSBotify · 2023-10-24T11:34:33Z

A preview of your ExpensifyHelp changes have been deployed to https://cea1af69.helpdot.pages.dev ⚡️

sonialiap · 2023-10-31T11:51:36Z

@akinwale how does this look, anything I need to change?

akinwale · 2023-10-31T12:07:10Z

@akinwale how does this look, anything I need to change?

Apologies. I missed the initial notification for this. I will review in a few hours.

akinwale

Just a few changes.

docs/articles/expensify-classic/insights-and-custom-reporting/Fringe-Benefits.md

akinwale · 2023-10-31T14:34:13Z

docs/articles/expensify-classic/insights-and-custom-reporting/Fringe-Benefits.md

+
+
+# For Users
+Once these steps are completed, users who create expenses coded with any category that has the payroll code “TAG” (e.g. Entertainment Expenses) but don’t add the internal and external attendee counts, will not be able to submit their expenses.


Suggested change

Once these steps are completed, users who create expenses coded with any category that has the payroll code “TAG” (e.g. Entertainment Expenses) but don’t add the internal and external attendee counts, will not be able to submit their expenses.

Once these steps are completed, users who create expenses coded with any category that has the payroll code “TAG” (e.g. Entertainment Expenses) but without the internal and external attendee counts, will not be able to submit their expenses.

I prefer "add" because it highlights that the user has to take an action, i.e. select a tag on the expense

akinwale · 2023-10-31T14:34:54Z

docs/articles/expensify-classic/insights-and-custom-reporting/Fringe-Benefits.md

+- Number of Internal Attendees (Tag 3)
+- Number of External Attendees (Tag 4)
+
+In the above case, you’ll want to use `{expense:tag:ntag-3}` and `{expense:tag:ntag-4}` as formulas to report on the number of internal and external attendees.


Suggested change

In the above case, you’ll want to use `{expense:tag:ntag-3}` and `{expense:tag:ntag-4}` as formulas to report on the number of internal and external attendees.

In the case above, you’ll want to use `{expense:tag:ntag-3}` and `{expense:tag:ntag-4}` as formulas to report on the number of internal and external attendees.

"above case" is a standard phrase so I would leave it as is

docs/articles/expensify-classic/insights-and-custom-reporting/Fringe-Benefits.md

…Fringe-Benefits.md Co-authored-by: Akinwale Ariwodola <akinwale@gmail.com>

akinwale · 2023-11-02T07:51:37Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

akinwale

LGTM.

Thanks for the updates.

melvin-bot · 2023-11-02T07:52:33Z

@aldo-expensify Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

melvin-bot · 2023-11-02T07:52:37Z

🎯 @akinwale, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #30750.

aldo-expensify

LGTM

OSBotify · 2023-11-06T22:33:22Z

🚀 Deployed to staging by https://github.com/aldo-expensify in version: 1.3.96-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-11-09T22:50:55Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.96-15 🚀

platform	result
🤖 android 🤖	failure ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-11-10T15:47:51Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.97-7 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

Create Fringe-Benefits.md

dd5d90c

sonialiap requested a review from a team as a code owner October 24, 2023 11:33

melvin-bot bot requested review from akinwale and removed request for a team October 24, 2023 11:33

sonialiap self-assigned this Oct 25, 2023

akinwale suggested changes Oct 31, 2023

View reviewed changes

sonialiap and others added 5 commits November 1, 2023 07:57

Update docs/articles/expensify-classic/insights-and-custom-reporting/…

b4e7978

…Fringe-Benefits.md Co-authored-by: Akinwale Ariwodola <akinwale@gmail.com>

Update Fringe-Benefits.md

4bf45db

Update docs/articles/expensify-classic/insights-and-custom-reporting/…

2a4b05a

…Fringe-Benefits.md Co-authored-by: Akinwale Ariwodola <akinwale@gmail.com>

Update docs/articles/expensify-classic/insights-and-custom-reporting/…

bc496a8

…Fringe-Benefits.md Co-authored-by: Akinwale Ariwodola <akinwale@gmail.com>

Update docs/articles/expensify-classic/insights-and-custom-reporting/…

a2d1f4f

…Fringe-Benefits.md Co-authored-by: Akinwale Ariwodola <akinwale@gmail.com>

akinwale approved these changes Nov 2, 2023

View reviewed changes

melvin-bot bot requested a review from aldo-expensify November 2, 2023 07:52

melvin-bot bot mentioned this pull request Nov 2, 2023

Payment issue for E/App PR#30245 #30750

Closed

aldo-expensify approved these changes Nov 2, 2023

View reviewed changes

aldo-expensify merged commit 11a7170 into main Nov 2, 2023
7 of 8 checks passed

aldo-expensify deleted the sonialiap-patch-1 branch November 2, 2023 18:50

OSBotify mentioned this pull request Nov 6, 2023

Deploy Checklist: New Expensify 2023-11-06 #30929

Closed

OSBotify mentioned this pull request Nov 8, 2023

Deploy Checklist: New Expensify 2023-11-08 #31077

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Create Fringe-Benefits.md #30245

Create Fringe-Benefits.md #30245

sonialiap commented Oct 24, 2023 •

edited

Loading

melvin-bot bot commented Oct 24, 2023

OSBotify commented Oct 24, 2023 •

edited

Loading

sonialiap commented Oct 31, 2023

akinwale commented Oct 31, 2023

akinwale left a comment

akinwale Oct 31, 2023

sonialiap Nov 1, 2023

akinwale Oct 31, 2023

sonialiap Nov 1, 2023 •

edited

Loading

akinwale commented Nov 2, 2023

akinwale left a comment

melvin-bot bot commented Nov 2, 2023

melvin-bot bot commented Nov 2, 2023

aldo-expensify left a comment

OSBotify commented Nov 6, 2023

OSBotify commented Nov 9, 2023

OSBotify commented Nov 10, 2023



		# For Users
		Once these steps are completed, users who create expenses coded with any category that has the payroll code “TAG” (e.g. Entertainment Expenses) but don’t add the internal and external attendee counts, will not be able to submit their expenses.

	In the above case, you’ll want to use `{expense:tag:ntag-3}` and `{expense:tag:ntag-4}` as formulas to report on the number of internal and external attendees.
	In the case above, you’ll want to use `{expense:tag:ntag-3}` and `{expense:tag:ntag-4}` as formulas to report on the number of internal and external attendees.

Create Fringe-Benefits.md #30245

Create Fringe-Benefits.md #30245

Conversation

sonialiap commented Oct 24, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 24, 2023

OSBotify commented Oct 24, 2023 • edited Loading

sonialiap commented Oct 31, 2023

akinwale commented Oct 31, 2023

akinwale left a comment

Choose a reason for hiding this comment

akinwale Oct 31, 2023

Choose a reason for hiding this comment

sonialiap Nov 1, 2023

Choose a reason for hiding this comment

akinwale Oct 31, 2023

Choose a reason for hiding this comment

sonialiap Nov 1, 2023 • edited Loading

Choose a reason for hiding this comment

akinwale commented Nov 2, 2023

Reviewer Checklist

Screenshots/Videos

akinwale left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Nov 2, 2023

melvin-bot bot commented Nov 2, 2023

aldo-expensify left a comment

Choose a reason for hiding this comment

OSBotify commented Nov 6, 2023

OSBotify commented Nov 9, 2023

OSBotify commented Nov 10, 2023

sonialiap commented Oct 24, 2023 •

edited

Loading

OSBotify commented Oct 24, 2023 •

edited

Loading

sonialiap Nov 1, 2023 •

edited

Loading